data cleansing on argos class; some ui refinements