More improvements, mostly organizational.