Nice first version. Congratulations! [:)]
As inner polygons seem to be generally accurate, I guess you are on the good path to fix most issues.