code controll and corrections