More stuff, and fixes