Commented more fixes

Commented more fixes