tweaks around querysets
correcting failing tests - almost done, but its Friday (gotta get down on Friday)