Revert "various tweaks" - copied files incorrectly affected the diff.

This reverts commit 925050a95d3aa357b445271b1261fe35087ccbef.