merge fixes; light reorganization of package; light formatting