fixing first mistakes