Fix #610. Pause toggle display issue.
Fix #600. Issue caused by not passing model_type argument
Merge pull request #611 from duncanspumpkin/bug_fix

Bug fixes