Got the splitter to work properly!
Minor fixes.