Large overhaul on naming, orthography, signatures, some better abstraction.
Note that three signatures are still commented out - they throw errors.