Javadoc, some fixes, pw changing