Added some color and bug fixes.