Updates to isFinal and fix off by one errors