some more code corrections