Couple of improvements and additional examples