WIP: tests + fixes + love