miscellaneous small changes