Add colorize, few minor fixes