fixed minor issues better address