unclaimed now resets properly
relatively minor optimization tweaks