Fixed the layout of some error messages as well as teh layout of the code