Added score_obs; various cleanups.