fixes and updates for body handling