Fixed list and added details on end of packet scenarios