Ok... I added some Wps down at the river (not really necessary IMO, but once i was at it...).
What's more important: I added some WPs in that entry hall, getting rid of those long, slightly angled connections through the doors to the two rooms left and right of the entrance. If the WP distribution looks strange, that's because of the doors. Bots won't run into doors this way.
If you have the old file, don't worry - I never saw real problems at the two spots mentioned above. This new version is just a little more exact - maybe even good enough to please SoUlFaThEr and make him proud of me...
or not? Anyway, here's the file - enjoy: