Fixed KVO, General Cleanup

KVO without super... :grin:
Removed unneeded (empty) functions