More code changes in warsong gulch