update magic-string
fix scope bug
small fixes
update tests