Rewrite jail data handling, fix some NPE's with block events