Fixed kind variable application bug; first round of new ordering completed.