Clean up, added responses