fixed colors.
fixed svg redraw.
cleaned some code up.