general updating to the code