fixes based on zac's comment