won menu, and little clean up