Initial updates

Made some changes so that the scripts can be used easier on multiple
computers