Fixed bugs and added service