Collect user input
Merge fixes.