cleaned up data model a bit, renamed some rake tasks, and worked on some issues with the jr1 counting