preliminary observe support, and some other fixes and improvements