Improved transfer and type is now / switching mode, issue #153