Wow, another edit.

This has various fixes.