added setup service & cleaned some mess