Fixing many many minor issues