Command coloring and fixes