Minor tweaks and notes