Javadocs and small changes