various tunings
Merge pull request #111 from ovicin/master

various tunings