Fixed minor bugs with colors and tagging