only some small code corrections