fixed lots of things