WIP - Fixes pics

just a few small changes.

Actually fixed a couple of tests.