Copy ammendments and other fixes