more notes and tweaking