more fixes also closes #384
Merge pull request #390 from way2muchnoise/1.7-update

more fixes also closes #384