small miscellaneous improvements