Kdalton/sample feedback

@anttikajanus - Please review updates/fixes based on feedback.