fixing first issues