forgot to cmmit last changes
updated eb docs
fixed merge conflicts