misc changes
modified coloring
updated final bugs