A few important fixes to my classes

Merging immediately