Misc optimizations.

Should we have a '--quick' instead of selecting method by number, perhaps?