Fix form target URL and other minor tweaks.
Explicitly make sure populations are numbers, not strings.
Updated TODO