Better service type detection, and a few doc fixes