Khanlou code review changes & notes for later