More tweaks and notes