Fixed minor bugs, but there are new kvo leaks.