Added stuff on observable parameters and re-ordered stuff.