Minor corrections, added color table functionality