fix messages
implement po calls