fixed things from Louis's review.