Added more javadoc comments
Updated time tracking