debugg and corrections