more code corrections