Academic Title generator, minor bugfixes, minor refactoring