Added color and small fixes