Changed some formats/variable names/pointers