fix compilation issues
adapt to SF_Changes!
update framework