Add some missing break statements & fix some broken logic with regards to advancing the current entry pointer