Overlord response to PR feedback

Great job with happy/sad/error path :+1: