Fixed KVO
Cleanup