More consistency issues fixed, also removed the possibility of an 'invalid offset' error on input