fix the secretness bug (hopefully)
split off MenuWithToolTips
fix static analysis errors