Added some more javadoc and todos