minor changes at db and var renaming