Fixed some bugs, finished javadoc