More tweaks and examples