Change function order.
Tweaks.