more notes, better layout