updated menu & added javadocs