Refactoring almost done - main controller shortened by 150 lines: fill blank, meta stats, bug fixes