Added comments, helpers, partial errors, and categories