merge with stashed minor changes to fusion.c