Removed TODO's and added javadoc info