added some notes to what should be fixed