Update samples
Various updates