Adding various notes and todos