some fixes + return window indices in batch.indices()

some fixes + return window indices in batch.indices() #477