Notes: various more comments and DONE markers