add \roll command, a few other tweaks