Fix comments n junk