Various bugfixes, regression fixes, fixes for Pr comments on #465
Removing a temporary (auto-generated) backup file which was accidentally commited