use curdir not pwd & align vars