merge some things in from dirk2