including commy's corrections

don't know on the reveal, though