Fixes from new changes

needed to update stuff so that it doesnt look stupid when we run the new
queries. Also, the new stuff is really cool.