Changes and fixes...

Changes and fixes....