OK, several good fixes here.