Some fixes in accordance to proof reading