diff --git a/src/file/mod.rs b/src/file/mod.rs
index 7d0b0ce..80487ed 100644
--- a/src/file/mod.rs
+++ b/src/file/mod.rs
@@ -25,6 +25,7 @@ pub fn get_filepath(data_dir: &PathBuf, date: &NaiveDate) -> PathBuf {
     file_path
 }
 
+// generate strings from  TaskGroups and date
 pub fn generate_file_content(data: &Vec<TaskGroup>, date: &NaiveDate) -> String {
     let mut content = format!(
         "# Today's tasks {}-{:02}-{:02}\n",
@@ -43,6 +44,7 @@ pub fn write_file(path: &PathBuf, content: &String) {
     write!(new_file, "{}", content).expect("Could not write to file: {today_file_path}");
 }
 
+/// Load in text file as String
 pub fn load_file(file: &TodoFile) -> String {
     let contents_utf8 = read(file.file.clone())
         .expect(format!("Could not read file {}", file.file.to_string_lossy()).as_str());
@@ -57,6 +59,7 @@ pub fn load_file(file: &TodoFile) -> String {
         .to_string()
 }
 
+/// Parse contents of markdown file with Comrak ( relaxed tasklist matching is enabled)
 pub fn parse_todo_file<'a>(contents: &String, arena: &'a Arena<AstNode<'a>>) -> &'a AstNode<'a> {
     let options = &ComrakOptions {
         extension: ComrakExtensionOptions {
diff --git a/src/main.rs b/src/main.rs
index ab89a7d..ad17a16 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,22 +20,26 @@ use std::process::Command;
 use todo::{File as TodoFile, TaskGroup};
 
 fn main() {
+    // setup
     let args = Args::parse();
     let _logger = init_with_level(get_logging_level(args.verbose)).unwrap();
     log::debug!("{:?}", args);
 
+    // getting config location
     let expected_cfg_files = match Config::expected_locations() {
         Ok(cfg_files) => cfg_files,
         Err(e) => panic!("{:?}", e),
     };
 
+    // getting exising config files
     let cfg_files: Vec<&Path> = expected_cfg_files
         .iter()
         .map(|file| Path::new(file))
         .filter(|file| file.exists())
         .collect();
 
-    if cfg_files.len() <= 0 {
+    // writing default config if non exist
+    if cfg_files.len() <= 0 && args.config.is_none() {
         if let Err(e) = Config::write_default(match expected_cfg_files[0].to_str() {
             Some(s) => s,
             None => panic!("Could not resolve expected cfg file paths"),
@@ -44,6 +48,7 @@ fn main() {
         }
     }
 
+    // set witch config file to load
     let cfg_file = match args.config {
         Some(file) => file,
         None => match cfg_files.last() {
@@ -52,19 +57,23 @@ fn main() {
         },
     };
 
+    // show current config file or just log it based on args
     if args.current_config {
-        log::debug!("{}", &cfg_file);
+        print!("{}", &cfg_file);
         return;
+    } else {
+        log::debug!("config file: {}", &cfg_file);
     }
 
+    // load config file
     let cfg = match Config::load(&cfg_file) {
         Ok(cfg) => cfg,
         Err(_e) => panic!("could not load config: {}", cfg_file),
     };
     log::debug!("{:#?}", cfg);
 
+    // resolve data directory and create it if it does not exisit
     let data_dir = cfg.notes_dir.resolve().to_path_buf();
-
     if !fs::metadata(&data_dir).is_ok() {
         match fs::create_dir_all(&data_dir) {
             Err(_e) => panic!("Could not create default directory: {:?}", &data_dir),
@@ -72,10 +81,12 @@ fn main() {
         };
     }
 
+    // get file paths of notes
     let files = fs::read_dir(&data_dir)
         .expect(format!("Could not find notes folder: {:?}", &data_dir).as_str())
         .filter_map(|f| f.ok())
         .map(|file| file.path());
+    // list all notes
     if args.list_all {
         files
             .into_iter()
@@ -83,13 +94,11 @@ fn main() {
         return ();
     }
 
+    // get clossest files to specified date
     let today = Local::now().date_naive();
     let target = today - TimeDelta::try_days(args.previous.into()).unwrap();
-    if args.list_all {
-        files.for_each(|f| println!("{}", f.canonicalize().unwrap().to_string_lossy()));
-        return ();
-    }
     let closest_files = TodoFile::get_closest_files(files.collect(), target, args.number);
+    // list files
     if args.list {
         closest_files
             .into_iter()
@@ -99,11 +108,13 @@ fn main() {
 
     let latest_file = closest_files.first();
     let current_file = match latest_file {
+        // copy old file if the user specifies today's notes but it does not exist
         Some(todo_file) if todo_file.date < today && args.previous == 0 => {
             let sections = &cfg.sections;
             log::info!("looking for sections: {:?}", sections);
             let arena = Arena::new();
 
+            // attempt to load file
             let root = {
                 log::info!(
                     "loading and parsing file: {}",
@@ -114,8 +125,10 @@ fn main() {
                 root
             };
             log::trace!("file loaded");
+            // extract sections specified in config
             let groups = file::extract_secitons(root, sections);
             log::trace!("sections extracted");
+            // create new sections and generate empty sections for any that are missing
             let level = groups.values().map(|group| group.level).min().unwrap_or(2);
             let data = sections
                 .iter()
@@ -125,14 +138,19 @@ fn main() {
                 })
                 .collect();
 
+            // generate string for new file and write to filesystem
             let content = file::generate_file_content(&data, &today);
             let file_path = file::get_filepath(&data_dir, &today);
             log::info!("writing to file: {}", file_path.to_string_lossy());
             file::write_file(&file_path, &content);
+            // return file name
             file_path
         }
-        Some(todo_file) => todo_file.file.clone(),
+        // returning the selected file
+        Some(todo_file) => todo_file.file.to_owned(),
+        // no note files exist creating based on template from config
         None => {
+            // generate empty file
             let sections = &cfg.sections;
             log::info!("creating new empty file with sections: {:?}", sections);
             let data = sections
@@ -143,10 +161,12 @@ fn main() {
             let file_path = file::get_filepath(&data_dir, &today);
             file::write_file(&file_path, &content);
             log::info!("writing to file: {}", file_path.to_string_lossy());
+            // return file name
             file_path
         }
     };
 
+    // opening file
     log::info!(
         "Opening {} in {}",
         current_file.to_string_lossy(),