misc cleanup and small updates