fixed splitter stuff, and broke other stuff