some small changes to get things services running independently