submit comments added, dataService refactored