updated to-do and equalized quotes throughout