renamed measure to observation, few fixes