Fixed interface construction
Nicer thread termination on app exit