fixed some address issues