Fix comments bug

Fix comments bug and make some checks