Fixed up a few older features that were kind of messed with for debugging
purposes. Should be a lot nicer for presentation.