more work on conclusions and a bugfix on RF cav M terms