Several useless changes.
More logic.