Add some new MIME types
Cleanup
Support trimContents on writer too.