finished dealing with the one to many problem between the CBD zone and max years and more clean up