fixes #153 fixes #151 fixes #134