More scenario & block changes, refs #3