misc updates to everything
misc updates to everything 2