Updated A shit ton of stuff