Side notes & small tweaks