so many fixes before final build