fix warnings
fix warnings
fix term choice order