Several tweeks made