fixed lots of stuff.