Fixed a few more bugs...

AND found some caveats, which will be listed as issues shortly.