Minor fixes! The beggining of TreeModel