fix some regressions, closes #150, closes #151