With these changes, issue #2 is really getting somewhere.