- finalize migration to UUID
- bugfixes, clean-up