some cleanup and fixes in gaspi_run