many fixes… lez go.. ALMOST there