lots of good stuff
fixed stuff