Improve responsiveness, closes #98