Fixing few referennces and other minor modifications.