a few miscellaneous changes