fixes for unpakcaged files and removeing *.old (from Eirik Thorsnes)