Fixed the asymmetry bug.  Colors now look nice :)
Also a lot of cleanup and rearrangment.