New parts added and corrections.