Various fixes
Added ability to use previously imported key
Fixed typo
Fixed typo