error reporting bug
scope is now a form.
file renames, minor adjustments.