fix stuff in save_fields, now not calling RHS if this is not required
fix string comparison in mainfile + add variables in sponge (bugfix)