fixed menuing
fixed merge errors