docs and updtes
merge