final few tweaks