Found more fixes

Found more fixes, added the comments