Fixed various addresses and such.