menu ready + bug fixes