Many bug fixes and updates

Many bug fixes and updates