tidy up, debug stuff, relative paths work