more porting and some absolute paths.