various changes toward merging daxtens tree