some more notes and adjustments