some cleanup to menu code, config...