minor changes made before merging with master