Cleaned up and updated more javadocs