Cleaned up scripts
merging in changes from devel