Fixed a potential bug, updated some code that was out-of-date, and made
something work again... Not sure what.
Added path separator.