Changes to doc and basic and empty docs