Better validation, searching, and options