more cleanup and adjustments