Many changes and updates
Various fixes and updates