diff --git a/Snakefile b/Snakefile
index 6a88d63480e01b8102ebff5a621c17a8a8ec9354..5581090b37a78cdff7936df9931d4c223c855087 100644
--- a/Snakefile
+++ b/Snakefile
@@ -20,17 +20,18 @@ TODO: Discuss descriptions (matrices, cfl number, right-hand side,
     limiting slope, basis, wavelet, etc.)
 TODO: Discuss referencing info on SSPRK3
 TODO: Discuss name for quadrature mesh (now: grid)
+TODO: Contemplate using lambdify for basis
 
 Urgent:
-TODO: Move plot_approximation_results() into plotting script
-TODO: Introduce env files for each SM rule
-
-Critical, but not urgent:
-TODO: Restructure 'calculate_approximate_solution()'
-TODO: Rework Theoretical TCD for efficiency
+TODO: Move mesh into separate file -> Done
+TODO: Restructure 'calculate_approximate_solution()' -> Done (not needed)
+TODO: Vectorize 'calculate_approximate_solution()' -> Done
+TODO: Vectorize 'calculate_exact_solution()' -> Done
+TODO: Rework Theoretical TCD for efficiency -> Done
 TODO: Extract object initialization from DGScheme
-TODO: Replace loops with list comprehension if feasible
 TODO: Replace loops/list comprehension with vectorization if feasible
+TODO: Replace loops with list comprehension if feasible
+TODO: Rework ICs to allow vector input
 TODO: Check whether 'projection' is always a ndarray
 TODO: Check whether ghost cells are handled/set correctly
 TODO: Enforce even number of ghost cells on each side on fine mesh (?)
@@ -40,7 +41,8 @@ TODO: Create g-mesh with Mesh class
 TODO: Combine ANN workflows if feasible
 TODO: Investigate profiling for speed up
 
-Currently not critical:
+Critical, but not urgent:
+TODO: Introduce env files for each SM rule
 TODO: Add an environment file for Snakemake
 TODO: Rename files according to standard
 TODO: Allow comparison between ANN training datasets
@@ -49,6 +51,9 @@ TODO: Add a default model state
 TODO: Look into validators for variable checks
 
 Not feasible yet or doc-related:
+TODO: Move plot_approximation_results() into plotting script
+TODO: Move plot_results() into plotting script
+TODO: Move plot_evaluation_results() into plotting script
 TODO: Enforce SM conventions (no direct access to config, order in rule, etc.)
 TODO: Replace pop() with get() for dictionary access
 TODO: Induce shift in IC class