Fix comments and such