Stupid bug
Remove writer claim last
Small tweaks