Yup, the whole rug thing is pretty confusing for them. A giant rug in a private setting is much better
I would suggest giving him a little free space at a time with gates or whatever to protect areas you don't want him to go. Don't give him freedom until you see him go back to his approved potty area on a regular basis.