Address validity check is now used. Some minor changes, comments.