Restored my disconnection method, again
Fixed traps, again
add changes to the crosshair and the scroll feature