Readme file update and multiple bug fixes