~~various small fixes
+ exit handler (not linked with managers yet, but otherwise functional)
Merge remote-tracking branch 'origin/master'