Fixed up the last couple of things