Improved migrations/models; untracked aux files