- miscellaneous improvements