New stuff, and fixes