fixed lots of stuff