Thanks Section, TODO Update, and Cleanup

Thanks Section, TODO Update, and Cleanup