Terminal paste
more osx support
minor tweaks