Eclipse moves stuff.  Yay!
Minor updates.