added trap to unmount on interruption
reverted 2 earlier readability changes (didn't work)