feature complete, small performance and usability improvements made, clutter removed, comments added and removed where needed