Cleanup - fixes - rebuild /he undo's added