Made a few tweaks

Made a few tweaks