Better error messages. Better comments.