address issues that @kylebeauchamp brought up