improve url address and some fixes