Charges upgraded in Goode murder case