fix import of "choice" and add some better debug notes