Minor changes and amends