* merged burrow and burrow2
* other refactoring