Sub0ptimal: Internal update

Small internal changes.