prima: fixes and changes