squid minor
some changes