fix vars and comments and more.