Still more code cleaning
many bug correction, should works with last version of fio.