More Minor updates ...

More Minor updates ...