Changed some shit, added some shit, deleted some more shit