Adds a few tweaks