Some cleanup, Added markers to tree