fixup paths and cleanup