updated rs.js & adjusted order of some things