lots of bug fixes!
updates