miscellaneous updates/bug fixes