Made some final touches. Ready for review.