Update readme and fix bug after user testing.