Fixed embarrassing cloning and script issues :(