(editing on separate machine) fixing interaction bugs