removing lots of junk
more bug fixes and performance improvements