Buik commit: lots of fixes from requests (sanger order activated)