Fixed some issues

lastest updates avaliable at http://fermi.theredian.org/d/