fix errors and add services