making fixes per yoni's comments