Minor tweaks.
Eigenwhales might actually work...