Added/improved/fixed javadocs
Added TODO for future work
Further adjustment of javadocs