Added color changing, fixed some bugs