Many improvements, mainly usage of fig to manage services