split and misc improvements