changed history to commentary, cleaned up dependencies in main