Catch ActiveRecord up and do some general refactoring/minor bug-fixes.