more cleanup ... now also works in terminal