Update readme and bug fixes