more firnmodel.py edits