Tinkering

Further updates, revisions, and bug-fixes