Add back World/Quit, 2 fixes to Directories (thanks Bernhard and Ken)