Now support spaces in folder names. Streamlined variable access.