Adjust sizes a little, and some TODO++.