removed html from docs
merge fix
minor changes