Fixed weird Q behaviour and E in combo

Also updated the menu handling which will not be visible ingame, aswell
as some other little code tweaks.