General improvments - working towards ability to apply MS to individual tables