change paths and fix a small bug