Cleanup, plus started some batch adding.