More small tweaks.