miscellaneous improvements