changed a bunch of stuff to get qa things working