Model 3D + projected + non-uniform samples.
Clean up.
Fix phase correction.
Remove old unit types.
Remove unused elements, reorganize.