More services & small clean ups

See previous comment about "Unknown".