Fixed small bugs, added more meaningful logs
Merge branch 'newclient' of github.com:sbarman/webscript into newclient