Made some tweeks