Updates

Updates and changes see log