Design fix
Some doc fixes