some internal var renames, close #4