fixing `none` and `nothing`

closes gh-106