fix r_remove_item helper
add simple checkpoints