Some tweaks and examples