Updated comments
Fixed incorrect examples, and added service class comments