[wip] Some small changes.