Finished CloneTool
Minor fixes to BoxTool