Quick and dirty fixes to Erich’s nonsense. This whole project needs a major refactor.