revised all sorts of stuff