fixed some of notes, other must be discused