Bunch of fixes

Why removing the index count? Not only it provided more sense to the values, it could also be a different type.