#15 Fixed even more interaction bugs.