Kdalton/sample feedback

@anttikajanus - Could you please review.