Add bug fixes dealing with changing instance variables to class variables.
Add fixes to bugs.
Fix merge conflicts.