Latest combined file with doc fixes