misc cleanup and changes