minor improves
minor changes
preparing for dtree