discard -> forget
Other minor fixes