todos: Fix some variable name and write some todos here and there