fix up a few things based on @ali-graham's feedback