changed all sorts of stuff