improved api responses and messages