Changing path's and small fixes
Pull