Added some responses, and updated the catch-all