minor improvements for indices in blocks
fix tests after moving eval math