major updates to everything