Added more verbose error reporting to the end user
fixed conflict resolution of white space