Added dialog changes, and some minor fixes.