add callback for huxley modes; better error msgs
forgot to delete accidental test diffs