Amendments to the registry entries caused by testing
Further changes to grid/screen referencing - should have been committed some time ago!