Fixed some of the concatentation errors in the code, also added in the address function