Corrected last bugs. Prodable version