Fixup docs. Other minor cleanup.
Fix minor syntax error.
Remove unneeded KVO. Also use context.