One TODO fixed and some Javadocs added or reviewed.