Slight changes

Breaks on get colour...going to have to explain to me what that does.