Couple of improvements to these samples. Will redo this properly shortly.