updates to ogsi
merged