supa minor changes to stuff