mostly a minor tidy up; couple of bits for darwin