Added some reminders of things that need to be changed