Many changes, including MAList tidiers