bunch of slight query tweaks
take cleaner and faster approach