moved comments into the actual entry model