Added colors and fixed minor things