saturday commit, finishing anno refactoring, + misc