Added a bunch of shit i missed....