clean up some brokenness
more utilities we'll need later on