orm: Add several new gizmos and fix a few small issues