updated a bunch