Improve examples a bit