small changes
Merge pull request #216 from maraoz/misc/various

small changes