used page speed to speed a few things up
rearranged a few things