fixed contoller and added new guntype