Master changes

includes crosshair and rocket