mostly cosmetic changes
did merge
merged eli's stuff.  Fixed some bugs