first build and bug fixes (nonvarargs for Prompt, and return on x2test)