more small chagnes
fixed oops move of moving files to wrong directory