schema changes, and pesky jshint semicolons