Correct sizing
Exclude logic
Correct ending detection