Minor tweaks, example updates