lots of fixes across the board.