Fixed Issues and Finished Cloning