Fixed up some opting stuff and got the services cleaned up