Removed some hardcoding

from the Forst half of the scripts