extended samples, added Javadoc, some repackaging