Lots of prototype tests/tweaks.