Minor changes to some comments and error reporting improvements (TODO, improve the copy pasted error reporting code)