Lots of Bug Fixes and Comments Added