Incorporated everyone's work.  Good for beta?  Minor tweaks.