shit
Revert "shit"

This reverts commit 9691c644b5beeabc9da778f85b6f9e78c2fe4118.
Some fixes, cleanup.