Updated again, added a ton of stuff