Sorted the project and fixed errors

Writing in the github text editor at the library led to some errors.
Life is hard without intellesense.