Slightly better.
More minor tweaks.
Verification in starterupper.
More sanity checking all around.