Mostly menu edits... some math updates