even more Javadoc finished, and removed som code which is not used