underscores to dashes, plus a bugfix in pret-while

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>