a few more miscellaneous changes