iterate on schemas
added changes from redmine
cleaned up stray defaults