removed unnecessary variables, fixed address bug
really fixed address bug