Added colors + fixed some bugs