Fixed some bugs + events + services