Forcegrapher working more nicely (#547)