Further work on issues #1 and #2.