Minor bugs and crosshair