Minor fixes, still ready for review.