New version - major fixes