miscellaneous improvements *