added dialog and other misc changes