Think I've fixed that indexOutOfBounds issues.