Added colors + Fixed some bugs