Added comments and error-messages