fixed path bug, cosmetic changes