file fixes from yesterday
further file cleanups