second round reviews added in one file

I guess I forgot to send this pull-request when travelling. That's why it is two weeks old.