Colored output and some fixes