Bug fixes where I had not used this. in some of the methods.