Added code corrections