Fix issues and add colors