source dialog and fixes