sync with RSVP.

- performance
- reduced file-size
- bugfixes
- new build system