small fixes and filecopy included