split bugs

before merging