Updated various things