Added comments and make a couple tweaks to the stubbed services.