Small refactorings, adding TODOs.
Optimizing loops.
Subdomain exclusion.