More scrip clean ups and relative path support