updating to latest fixes, doc need to be updated