working on last changes before 1st release