various fixes
Merge pull request #223 from mauroservienti/master

various minor fixes