fixes3

general fixes