Fx3 cleanup v3

This patch addresses #87 and starts to address #88.