fixing 1291, cleaning up logs a little

--HG--
extra : source : e30cc41301ab716c8ee53d701f6f42e8500914d6
Merge pull request #586 from einhverfr/master

fixing 1291, cleaning up logs a little