Next steps added to rungene.py and a bit of housekeeping done elsewhere