minor reworks