Added Javadoc and final fixes. Should be done.
Couple more fixes
Fixed errors, please let me know if there's anything else. :)
Fixed up TRunner and added Javadoc
fixed merge conflict