- bunch more general fixes