ENFIN correction bug buildings + optimisations