Fix some things

Oh ohoh ho I'm fiddling with things