a few more improvements
might fix Color import issue #20