added missing variabled and fixed paths