add resume things
merge updates from scala-js