adding miscellaneous tweaks