changed menu handling, small changes to weapon collision checks