Still more fixes and streamlining