fixing 1291, cleaning up logs a little
Merge pull request #585 from einhverfr/1.4

fixing 1291, cleaning up logs a little