corrected javadoc & cleanup
close #48