End of writing readme and few bug fixes