fixing 1291, cleaning up logs a little