Last commit, many fixes, copy updated