Dialogs seem to be working
fixed include bug
removed .orig file