Solves multiple IndexOutOfBounds issues


Signed-off-by: Nick Minkler <sleaker@gmail.com>