Removed the buggy buffered tree and replaced it with khash which seems to be more reliable.