some last tweaks -- merging to master