More logging and better handling of services