gov: last update to fix all bugs