small fixes to copy, deleted some garbagefiles