solved problem involving multiple max years existing in CBD, other general clean-up