mv'd back.  sigh
minor changes to help compilation