Update TODO. Comments and small tweaks