Small update docs and samples - see TODO