fixed problems before commit