fixed zachs nitpicks