score and menu fixes

and cleanup