Made a few tweeks