Fix comments and update README