further normalized forms
fixed error context