changes from other pc
incl. tidyset.txt