Bug in menu selection + minor fixes