minor clean-ups
no error
splitting bug
mark the bug