fixing many little errors