Speed up space filling.
More tests and fixes.