More javadoc + arranging classes + menu item interpolation control stuff