Some bugfixes, some simplifications a file copy/move function for the util