Add another sample and misc updates