miscellaneous updates and fixes