New code example and minor tweaks