Minor tweaks and corrections.