nice, lots of good improvements here
more stuff