added javadoc, moved observable