Review. Bug fixing and TODO addressing. Nothing new to report.