Add configuration options to latest master and fix splitter bug