minor changes 16 files