Made more changes to dialog trees, updated test application.