misc changes to codes