fix unsafe
fix std imports
Merge pull request #45 from kud1ing/master

Port to latest incoming