fixes and improvements while totally cleaning and upgrading live system