Latest stuff

Timo's latest as of 2013-08-21 to be merged back to japhb:master