Bug fixes. Extended the path system.