added support for rppa data and bug fixes