merged notes
updated docs