Few minor fixes implemented.