Fixed more mistakes by abhishek