more cleanup
add Text question type
allow reordering choices