fixed a bit of stuff