many changes to firnmodel code