More doc updates and fixing schema issues