A bunch of stuff, I got behind on commits as usual