making some progress on citations, comments and features implementation