more menupuzzle fixes