fixed some other comments, now also the code side seems to be at a level to be review...