added some color and stuff