Fixed #60 and also fixed #31
Fixed #55 , apart from doors, these _could_ be hard coded, but there are probably quite a few of these cases.