19 08 rebase

fixing bugs, update docs