small miscellaneous changes