Updated TODO
Merge branch 'master' into filtering
Sanitised bits of exception handling