add colors and fix bug