Fixes some error messages in API, updates from branch
Continuing to iterate on theming