Added a few tweaks