changed place, reorganized, +(notes,misc)