Refactor inserting from mime
Small fixes
Update README