fixed paths and other bugs