Tidy up threaded output somewhat, bump version