merged rawjs into save-and-load

now contains rawjs changes, need to redo save-and-load to work