Review, and some fixes