Ensure tolerance functions called when frame updating
bug fix to variable names
Merge pull request #1078 from brooksryba/develop

Develop
Fix duplicate state subscriptions
Merge pull request #1080 from demaagdk/develop

Minor bug fixes from testing FAVIS