Week 0x08

Not much time while squeezing in work between Mardi Gras weekends, but I somehow managed a lot of minor improvements