A couple minor tweaks, redid the generation calculation (again) so it
will behave well in the upcoming dot-esque layout