Strange things

Pseudo identical to base version, with skeleton of the improvements.
Results differ from base, but may be the correct ones.