several intermediate changes
updated docs