continued fixing up all examples with new API