Updates to ReST handling and path.