Better docs and data validation