merge in various changes onto dirk2