Improvements

There were some remaining mistakes. Solved