updated to use color object
updated draw methods with minor adjustments