Cleaned it up. Splay is still borken.