Improved previous iteration geometry handling
Fixed gro file name assignment