Adding hints and todos