Add some error handling to responses, update roadmap