fixes #287 fixes #282 fixes #280