Merge/refactor Rourke's Lore changes, fix ID overflow