New thanks to, and fix formatting