Added online time
Major javadoc / imports cleanup