More polish to observations