fix a bit of stuff