Temporary? fix made to DataModel.retrieveComments, as well as small changes made to NCA