Add comments and/or fixes for some of the REETODO items