Crouch gunning and some more fixes