Fixed KVO
Fixed a few other things