Re-added comments and added parser error messages