Trying to cope with relative locations
Cleaning up output