Updated almost everything... lol