Minor updates, fix response output
Hack to fix wycats/thor#261