Lot of fixes, new rev 0.0.7