Made a few tweaks