More services & small clean ups