Cleaned-up all the helper scripts so now they all function as intended - no longer broken