Merge pull request #25 from lararennie/label_fixes

Updating error and label messages, changes to the error message API.