Removed some dead code from DataContentPanel, added more cmoments, fixed flag setting omission