More bugs
Fix interaction logic again. Fixes #77