Zari's Fixes

Class Verification Fixes, plus some cleanup of code.