Made several updates.
merged