Added notification
replaced some dialog boxes with notification
clean up
minor fixes/changes