Minor improvements, architecture review.