Fix exports + comments