fixes for the last week or so
Merge branch 'master' of github.com:usrshare/twtclt