A few minor improvements, very much still a work in progress