dodany update 1to2 and small fixes