minor jalopy changes
Merge branch 'feature/88-longthreads-waitdialog' into dev