some clean up & small light sys fix