Added __unset to service base class, tidied up some docblocks