Comments done for now
- many cases the same commented fix have to be done in many other places