more work on choices
fix tests