qa fixes, closes #81, closes #86, closes #87