[wip] Fresh up some things