Updated some G&G stuff, switching computers