Updated math alignment and added some TODOs