Various updates and streamlining