End of sample TODOs; Bug fix in Dialogs
Switch to 0.9