slight tweaks and notes