misc reorganization changes