bunch of updates for a weekend yaaay