sff
merge branches & cleanup