fixes

- fixes from email
- r.js section