On location, please check again
1) Are these buildings really buldings on their own or are they part of one big building?
2) IIRC, somewhere here are toilets but not yet mapped
3) Is positioning of the castle and surrounding buildings really OK? My GPS track and BDOrtho IGN are both 5m northeast.
4) Castle walls are not yet mapped