Add correct rouning of blocks, emplace_back for ifstream