oh dear... This ability to fly through walls are all parts of the same problem. Hopefully I'll manage to fix all of them with one solution...
