jail: reworks & cleanups