Fixing up some of the issues I caused by refactoring frostillicus/frostillicus.py