Rc2

Minor update -- speed-up some tests and fix some comments.