Got rid of strafe + other changes

Fixed ternary operator problem