Updated various things 2